Merge "skip post instantiation configuration"