Merge "Add common method for advanced image configuration"